From: aude <aude.wiki@gmail.com>
Date: Wed, 2 Dec 2015 15:42:18 +0000 (+0100)
Subject: Consolidate Title normalization code in SearchUpdate
X-Git-Tag: 1.31.0-rc.0~8831^2
X-Git-Url: http://git.cyclocoop.org/%27%20.%20%24prefix%20.%20Wiki::transformTitleToURI%28%24matches%5B1%5D%29%20.%20%27?a=commitdiff_plain;h=afc46abd780b01aab123b60d7719b8845fdb31fa;p=lhc%2Fweb%2Fwiklou.git

Consolidate Title normalization code in SearchUpdate

and rename the private method to be more clear

Change-Id: Iec7b934babddd102402cfa7616accd91fd3422ff
---

diff --git a/includes/deferred/SearchUpdate.php b/includes/deferred/SearchUpdate.php
index 867fc61003..f6c80f44dc 100644
--- a/includes/deferred/SearchUpdate.php
+++ b/includes/deferred/SearchUpdate.php
@@ -86,8 +86,7 @@ class SearchUpdate implements DeferrableUpdate {
 				continue;
 			}
 
-			$indexTitle = $this->indexTitle( $search );
-			$normalTitle = $search->normalizeText( $indexTitle );
+			$normalTitle = $this->getNormalizedTitle( $search );
 
 			if ( $page === null ) {
 				$search->delete( $this->id, $normalTitle );
@@ -174,13 +173,13 @@ class SearchUpdate implements DeferrableUpdate {
 	}
 
 	/**
-	 * Get a string representation of a title suitable for
+	 * Get a normalized string representation of a title suitable for
 	 * including in a search index
 	 *
 	 * @param SearchEngine $search
 	 * @return string A stripped-down title string ready for the search index
 	 */
-	private function indexTitle( SearchEngine $search ) {
+	private function getNormalizedTitle( SearchEngine $search ) {
 		global $wgContLang;
 
 		$ns = $this->title->getNamespace();
@@ -200,6 +199,7 @@ class SearchUpdate implements DeferrableUpdate {
 		if ( $ns == NS_FILE ) {
 			$t = preg_replace( "/ (png|gif|jpg|jpeg|ogg)$/", "", $t );
 		}
-		return trim( $t );
+
+		return $search->normalizeText( trim( $t ) );
 	}
 }